mir: generate leave events for transient children

diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
index ca8d239c1645d74cc6d077b7cb89e48b6a23ec12..635d57554bbfbb4d3a578e47a414a52eb4a95472 100644 (file)
--- a/gdk/mir/gdkmir-private.h
+++ b/gdk/mir/gdkmir-private.h
@@ -140,4 +140,9 @@ GdkWindow * _gdk_mir_window_get_visible_transient_child (GdkWindow *window,
                                                          gint      *out_x,
                                                          gint      *out_y);
 
+/* TODO: Remove once we have proper transient window support. */
+void _gdk_mir_window_transient_children_foreach (GdkWindow *window,
+                                                 GFunc      func,
+                                                 gpointer   user_data);
+
 #endif /* __GDK_PRIVATE_MIR_H__ */

diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
index 8a1652842f9a4e92a093ff7f3c605523ba993b6a..71883034f0dbf3b1ef135c2d45df07f884cb8621 100644 (file)
--- a/gdk/mir/gdkmireventsource.c
+++ b/gdk/mir/gdkmireventsource.c
@@ -292,6 +292,44 @@ handle_key_event (GdkWindow *window, const MirKeyEvent *event)
     }
 }
 
+/* TODO: Remove once we have proper transient window support. */
+typedef struct
+{
+  gdouble x;
+  gdouble y;
+  guint32 event_time;
+  gboolean cursor_inside;
+} LeaveInfo;
+
+/* TODO: Remove once we have proper transient window support. */
+static void
+generate_leave_events (GdkWindow *window,
+                       LeaveInfo *user_data)
+{
+  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+  LeaveInfo info = *user_data;
+  gdouble x;
+  gdouble y;
+  gboolean cursor_inside;
+  MirMotionButton button_state;
+
+  info.x -= window->x;
+  info.y -= window->y;
+
+  if (info.cursor_inside)
+    info.cursor_inside = 0 <= info.x && info.x < window->width && 0 <= info.y && info.y < window->height;
+
+  _gdk_mir_window_impl_get_cursor_state (impl, &x, &y, &cursor_inside, &button_state);
+
+  if (cursor_inside && !info.cursor_inside)
+    {
+      _gdk_mir_window_impl_set_cursor_state (impl, x, y, FALSE, button_state);
+      generate_crossing_event (window, GDK_LEAVE_NOTIFY, info.x, info.y, info.event_time);
+    }
+
+  _gdk_mir_window_transient_children_foreach (window, (GFunc) generate_leave_events, &info);
+}
+
 static void
 handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
 {
@@ -313,6 +351,18 @@ handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
   modifier_state = get_modifier_state (event->modifiers, event->button_state);
   event_time = NANO_TO_MILLI (event->event_time);
 
+  /* TODO: Remove once we have proper transient window support. */
+    {
+      LeaveInfo info;
+
+      info.x = x;
+      info.y = y;
+      info.event_time = event_time;
+      info.cursor_inside = TRUE;
+
+      _gdk_mir_window_transient_children_foreach (window, (GFunc) generate_leave_events, &info);
+    }
+
   /* The Mir events generate hover-exits even while inside the window so
      counteract this by always generating an enter notify on all other events */
   if (!cursor_inside && event->action != mir_motion_action_hover_exit)

diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index fccba87713c4626fc6d774ad582131af7944cf66..b866868c8cbadb5278cc206738adb407243f5253 100644 (file)
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -958,6 +958,16 @@ _gdk_mir_window_get_visible_transient_child (GdkWindow *window,
   return window;
 }
 
+/* TODO: Remove once we have proper transient window support. */
+void
+_gdk_mir_window_transient_children_foreach (GdkWindow *window,
+                                            GFunc      func,
+                                            gpointer   user_data)
+{
+  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+  g_list_foreach (impl->transient_children, func, user_data);
+}
+
 static void
 gdk_mir_window_impl_get_frame_extents (GdkWindow    *window,
                                        GdkRectangle *rect)